Add optional binary relocatability #1414
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @xela-95 @mjcarroll I guess the bazel build system needs to be adapted to this change, do you have any pointer on how I could do that? Thanks! |
Signed-off-by: Silvio Traversaro <[email protected]>
5 tasks
Friendly ping @mjcarroll, thanks! |
|
changes look good to me. Perhaps we can get this in first and adapt the changes to bzl as a follow-on task? |
iche033
approved these changes
Aug 13, 2024
Ok for me! |
azeey
approved these changes
Aug 16, 2024
|
I've started seeing windows builds of downstream packages fail since this was merged:
|
scpeters
reviewed
Aug 19, 2024
| @@ -91,6 +109,11 @@ if (BUILD_TESTING) | |||
| -DGZ_SDFORMAT_STATIC_DEFINE | |||
| ) | |||
|
|
|||
| if(WIN32) | |||
| target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} | |||
| PRIVATE shlwapi) | |||
There was a problem hiding this comment.
maybe this needs to be public?
There was a problem hiding this comment.
actually this target_link_libraries call is inside if (BUILD_TESTING), but it should no depend on the value of BUILD_TESTING. I'll submit a PR shortly
|
The note on the |
8 tasks
Originally this was done to avoid to link |
Gazebo Harmonic and up don't support 20.04, so yeah, we could copy the gz-common joinPaths implementation with |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes part of gazebosim/gz-sim#626
Summary
This PR uses the changes introduced in gz-cmake3 in gazebosim/gz-cmake#334 to support the cmake installation directory to be moved after the
make installprefix, and continue to work without the need to set any special environment variable, as long as the library is compiled as shared. To avoid regressions and problems in Ubuntu Focal due to the use of std::filesystem, this new behaviour is only activated if theGZ_ENABLE_RELOCATABLE_INSTALLoption is enabled, and its default value isOFF.In particular, this PR defines a
sdf::getSharePath()function that should be used in place of theSDF_SHARE_PATHmacro to ensure that the library is relocatable.Furthermore, this PR also deprecates the
SDF_SHARE_PATHmacro, using the strategy described in https://stackoverflow.com/a/29297970 . That strategy works fine on GCC and Clang, while on MSVC it raise a warning:However, I think that it does anyhow the job of raising some kind of warning, and then at soon as the developer checks the macro definition the kind of warning is clear.
The PR also deprecates the
SDF_VERSION_PATHmacro without providing any replacement. This is done as at the moment theSDF_VERSION_PATHpoints to a non-existent directory:so I guess it is mostly unused, and it can be safely deprecated.
Similarly to gazebosim/gz-physics#507, a local copy of
joinPathsis imported to avoid to add a dependency ongz-common.Test it
The test should work as usual. The used CMake machinery is tested in gazebosim/gz-cmake#334 .
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.